From c1205bbbb9a23b0e3b7693e95110403881b217d3 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 23 Jan 2009 00:53:53 +0000 Subject: [PATCH] Don't handle errors when committing the completion (commit_completion_and_refresh): Don't do anything with the result of refresh...(), since this function doesn't get called during completion-related interaction. Signed-off-by: Federico Mena Quintero svn path=/trunk/; revision=22179 --- ChangeLog | 3 +++ gtk/gtkfilechooserentry.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3e285830f..5302759f95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,9 @@ (start_explicit_completion): Process the result from refresh...(). Here we present the actual feedback about only being able to display local folders for local_only=TRUE. + (commit_completion_and_refresh): Don't do anything with the result + of refresh...(), since this function doesn't get called during + completion-related interaction. 2009-01-22 Matthew Barnes diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index fabc23b9f0..30dcb61385 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -1246,7 +1246,7 @@ commit_completion_and_refresh (GtkFileChooserEntry *chooser_entry) GTK_ENTRY (chooser_entry)->text_length); } - /* FMQ: get result from the function below */ + /* Here we ignore the result of refresh_current_folder_and_file_part(); there is nothing we can do with it */ refresh_current_folder_and_file_part (chooser_entry, REFRESH_WHOLE_TEXT); } @@ -1759,12 +1759,11 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry, * @chooser_entry: a #GtkFileChooserEntry * * Gets the current folder for the #GtkFileChooserEntry. If the - * user has only entered a filename, this will be the base folder + * user has only entered a filename, this will be in the base folder * (see _gtk_file_chooser_entry_set_base_folder()), but if the * user has entered a relative or absolute path, then it will - * be different. If the user has entered a relative or absolute - * path that doesn't point to a folder in the file system, it will - * be %NULL. + * be different. If the user has entered unparsable text, or text which + * the entry cannot handle, this will return %NULL. * * Return value: the file for the current folder - this value is owned by the * chooser entry and must not be modified or freed. -- 2.30.2